diff --git a/android_dhcpcd.conf b/android_dhcpcd.conf
new file mode 100644
index 0000000..0fe3996
--- /dev/null
+++ b/android_dhcpcd.conf
@@ -0,0 +1,9 @@
+# dhcpcd configuration for Android Wi-Fi interface
+# See dhcpcd.conf(5) for details.
+
+# Disable solicitation of IPv6 Router Advertisements
+noipv6rs
+
+interface wlan0
+# dhcpcd-run-hooks uses these options.
+option subnet_mask, routers, domain_name_servers, interface_mtu
diff --git a/device.mk b/device.mk
index bda7ebf..15a21c0 100644
--- a/device.mk
+++ b/device.mk
@@ -89,6 +89,7 @@
         frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
         frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
         device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
+        device/linaro/hikey/android_dhcpcd.conf:system/etc/dhcpcd/dhcpcd.conf \
         device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf
 
 # Copy media codecs config file
diff --git a/init.hikey.rc b/init.hikey.rc
index 653f3d9..67b392b 100644
--- a/init.hikey.rc
+++ b/init.hikey.rc
@@ -95,3 +95,17 @@
      disabled
      oneshot
 
+service dhcpcd_wlan0 /system/bin/dhcpcd -dABKL
+     group dhcp
+     disabled
+     oneshot
+
+service dhcpcd_eth0 /system/bin/dhcpcd -dABKL
+     group dhcp
+     disabled
+     oneshot
+
+service dhcpcd_bt-pan /system/bin/dhcpcd -dABKL
+     group dhcp
+     disabled
+     oneshot